Skip to content

Commit 343df8f

Browse files
adriandarianadriandarian
authored
Merge pull request #31 from UCMercedACM/feature/project-migration
WIP Projects Page implemented
2 parents 4cb2516 + cf81dcd commit 343df8f

16 files changed

Lines changed: 523 additions & 8 deletions

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "client",
3-
"version": "0.0.0",
3+
"version": "0.0.1",
44
"private": true,
55
"scripts": {
66
"build": "ngtw build && ng build --prod",

‎src/app/app.module.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import { AppComponent } from "./app.component"; // Main app import
1414
import {
1515
TitleComponent,
1616
CoffeeComponent,
17-
WorkshopCardComponent
17+
WorkshopCardComponent,
18+
ProjectsDisplayComponent
1819
} from "./components";
1920

2021
// Container Imports
@@ -61,6 +62,7 @@ import { DataService } from "./services/data.service";
6162
MembersComponent,
6263
AccountComponent,
6364
WorkshopCardComponent,
65+
ProjectsDisplayComponent
6466
LoginComponent,
6567
SignUpComponent
6668
],

‎src/app/components/index.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { TitleComponent } from "./title/title.component";
22
import { CoffeeComponent } from "./coffee/coffee.component";
33
import { WorkshopCardComponent } from "./workshop-card/workshop-card.component";
4+
import { ProjectsDisplayComponent } from "./projects-display/projects-display.component";
45

56
export {
67
TitleComponent,
78
CoffeeComponent,
8-
WorkshopCardComponent
9+
WorkshopCardComponent,
10+
ProjectsDisplayComponent
911
};

‎src/app/components/projects-display/projects-display.component.html‎

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
<div class="projects-display">
2+
<div class="jumbotron">
3+
<h1 class="display-4">Projects at ACM</h1>
4+
<p class="lead">ACM offers many projects to advance your CSE Skills and your Resume</p>
5+
6+
</div>
7+
8+
9+
<div class="grid grid-cols-3 gap-4">
10+
<div>
11+
<div class="o-card o-card--mod-small">
12+
<div class="c-card">
13+
<img class="c-card_image" src="ACM.png" alt="Card Image">
14+
<div class="c-card_body">
15+
<h2 class="c-card_title">ACM Website
16+
<button id="button" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
17+
GitHub
18+
</button>
19+
</h2>
20+
<h5 class="c-card_secondary-title"></h5>
21+
<hr>
22+
23+
24+
<p class="c-card_text">
25+
Build a Robust Website for the Club
26+
</p>
27+
28+
<div class="grid grid-cols-2 gap-6">
29+
<div>
30+
31+
<h5 class="list-title"> Front End </h5>
32+
<ul class=frontEnd>
33+
<li class="list"> Angular</li>
34+
<li class="list"> Yarn</li>
35+
<li class="list"> HTML</li>
36+
<li class="list"> CSS</li>
37+
</ul>
38+
</div>
39+
40+
<div>
41+
<h5 class="list-title"> Back End</h5>
42+
<ul class=backEnd>
43+
<li class="list"> NGRX</li>
44+
<li class="list"> Databases</li>
45+
<li class="list"> Node.js</li>
46+
</ul>
47+
</div>
48+
49+
50+
</div>
51+
</div>
52+
</div>
53+
</div>
54+
</div>
55+
<!-- ... -->
56+
<div>
57+
<div class="o-card o-card--mod-small">
58+
<div class="c-card">
59+
<img class="c-card_image" src="ACM.png" alt="Card Image">
60+
<div class="c-card_body">
61+
<h2 class="c-card_title">Video Game CNN's
62+
<button id="button" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
63+
GitHub
64+
</button>
65+
</h2>
66+
<h5 class="c-card_secondary-title"></h5>
67+
<hr>
68+
<p class="c-card_text">
69+
Construct an Algorithm for a Game
70+
</p>
71+
72+
<div class="grid grid-cols-2 gap-6">
73+
<div>
74+
<h5> Front End </h5>
75+
<ul class=frontEnd>
76+
<li> Angular</li>
77+
<li> Yarn</li>
78+
<li> HTML</li>
79+
<li> CSS</li>
80+
</ul>
81+
</div>
82+
<div>
83+
<h5> Back End</h5>
84+
<ul class=backEnd>
85+
<li> NGRX</li>
86+
<li> Databases</li>
87+
<li> Node.js</li>
88+
<li> Java Script</li>
89+
</ul>
90+
</div>
91+
</div>
92+
</div>
93+
</div>
94+
</div>
95+
</div>
96+
<div>
97+
<div class="o-card o-card--mod-small">
98+
<div class="c-card">
99+
<img class="c-card_image" src="ACM.png" alt="Card Image">
100+
<div class="c-card_body">
101+
<h2 class="c-card_title">HandWriting CLI
102+
<button id="button" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
103+
GitHub
104+
</button>
105+
</h2>
106+
<h5 class="c-card_secondary-title"></h5>
107+
<hr>
108+
<p class="c-card_text">
109+
Create an app that can detect handwriting styles
110+
</p>
111+
112+
<div class="grid grid-cols-2 gap-6">
113+
<div>
114+
<h5> Front End </h5>
115+
<ul class=frontEnd>
116+
<li> Angular</li>
117+
<li> Yarn</li>
118+
<li> HTML</li>
119+
<li> CSS</li>
120+
</ul>
121+
</div>
122+
<div>
123+
<h5> Back End</h5>
124+
<ul class=backEnd>
125+
<li> NGRX</li>
126+
<li> Databases</li>
127+
<li> Node.js</li>
128+
<li> Java Script</li>
129+
</ul>
130+
</div>
131+
</div>
132+
</div>
133+
</div>
134+
</div>
135+
</div>
136+
</div>
137+
138+
<div class="grid grid-cols-3 gap-4">
139+
<div>
140+
<div class="o-card o-card--mod-small">
141+
<div class="c-card">
142+
<img class="c-card_image" src="ACM.png" alt="Card Image">
143+
<div class="c-card_body">
144+
<h2 class="c-card_title">ACM Website
145+
<button id="button" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
146+
GitHub
147+
</button>
148+
</h2>
149+
<h5 class="c-card_secondary-title"></h5>
150+
<hr>
151+
<p class="c-card_text">
152+
Build a Robust Website for the Club
153+
</p>
154+
155+
<div class="grid grid-cols-2 gap-6">
156+
<div>
157+
<h5> Front End </h5>
158+
<ul class=frontEnd>
159+
<li> Angular</li>
160+
<li> Yarn</li>
161+
<li> HTML</li>
162+
<li> CSS</li>
163+
</ul>
164+
</div>
165+
<div>
166+
<h5> Back End</h5>
167+
<ul class=backEnd>
168+
<li> NGRX</li>
169+
<li> Databases</li>
170+
<li> Node.js</li>
171+
<li> Java Script</li>
172+
</ul>
173+
</div>
174+
</div>
175+
</div>
176+
</div>
177+
</div>
178+
</div>
179+
<!-- ... -->
180+
<div>
181+
<div class="o-card o-card--mod-small">
182+
<div class="c-card">
183+
<img class="c-card_image" src="assets/img/ACM.png" alt="Card Image">
184+
<div class="c-card_body">
185+
<h2 class="c-card_title">Video Game CNN
186+
<button id="button" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
187+
GitHub
188+
</button>
189+
</h2>
190+
<h5 class="c-card_secondary-title"></h5>
191+
<hr>
192+
<p class="c-card_text">
193+
Construct an Algorithm for a Game
194+
</p>
195+
196+
<div class="grid grid-cols-2 gap-6">
197+
<div>
198+
<h5> Front End </h5>
199+
<ul class=frontEnd>
200+
<li> Angular</li>
201+
<li> Yarn</li>
202+
<li> HTML</li>
203+
<li> CSS</li>
204+
</ul>
205+
</div>
206+
<div>
207+
<h5> Back End</h5>
208+
<ul class=backEnd>
209+
<li> NGRX</li>
210+
<li> Databases</li>
211+
<li> Node.js</li>
212+
<li> Java Script</li>
213+
</ul>
214+
</div>
215+
</div>
216+
</div>
217+
</div>
218+
</div>
219+
</div>
220+
<div>
221+
<div class="o-card o-card--mod-small">
222+
<div class="c-card">
223+
<img class="c-card_image" src="ACM.png" alt="Card Image">
224+
<div class="c-card_body">
225+
<h2 class="c-card_title">HandWriting CLI
226+
<button id="button" class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
227+
GitHub
228+
</button>
229+
</h2>
230+
<h5 class="c-card_secondary-title"></h5>
231+
<hr>
232+
<p class="c-card_text">
233+
Create an app that can detect handwriting styles
234+
</p>
235+
236+
<div class="grid grid-cols-2 gap-6">
237+
<div>
238+
<h5> Front End </h5>
239+
<ul class=frontEnd>
240+
<li> Angular</li>
241+
<li> Yarn</li>
242+
<li> HTML</li>
243+
<li> CSS</li>
244+
</ul>
245+
</div>
246+
<div>
247+
<h5> Back End</h5>
248+
<ul class=backEnd>
249+
<li> NGRX</li>
250+
<li> Databases</li>
251+
<li> Node.js</li>
252+
<li> Java Script</li>
253+
</ul>
254+
</div>
255+
</div>
256+
</div>
257+
</div>
258+
</div>
259+
</div>
260+
</div>
261+
</div>

0 commit comments

Comments
 (0)