Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing some styling inconsistencies #17

Open
wants to merge 97 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
e6f9564
Unifying courses header into one single layout
Mau-MD Jul 5, 2022
4f7c5bb
Adding formik to login form
Mau-MD Jul 12, 2022
cf421b3
Adding handle login mutation
Mau-MD Jul 12, 2022
3eb3bd1
Adding frontend auth helper functions
Mau-MD Jul 12, 2022
782d7e2
Adding auth helper function
Mau-MD Jul 12, 2022
a4c0c05
Adding error handler to login
Mau-MD Jul 12, 2022
7415f19
Adding is fetching to login hook
Mau-MD Jul 12, 2022
979ffdd
Adding validation schema to login form
Mau-MD Jul 12, 2022
4d7ee71
Adding requireAuth component
Mau-MD Jul 12, 2022
b1ad905
Merge branch 'learning_layout' into register
Mau-MD Jul 12, 2022
12ea174
Removing isFetching as it is unnecesary
Mau-MD Jul 12, 2022
b58bf61
Readding isFetching because it has a purpose
Mau-MD Jul 12, 2022
f2e4187
Adding loading spinner
Mau-MD Jul 12, 2022
98eea8c
Fixing infinite loading
Mau-MD Jul 12, 2022
6370c58
removing console log
Mau-MD Jul 12, 2022
4f99098
Merge branch 'gcloud' into dev
Mau-MD Jul 12, 2022
02fac08
Merge branch 'learning_layout' into dev
Mau-MD Jul 12, 2022
569cf4a
Merge branch 'ranking_unit' into dev
Mau-MD Jul 12, 2022
ce75881
Merge branch 'register' into dev
Mau-MD Jul 12, 2022
2d8a5f6
Adding dashboard route
Mau-MD Jul 12, 2022
81f4e15
Adding initial dashboard header
Mau-MD Jul 12, 2022
2dfaaf4
Adding grid
Mau-MD Jul 12, 2022
927588c
Adding course dashboard card
Mau-MD Jul 12, 2022
464e37a
Adding correct menu items
Mau-MD Jul 12, 2022
a4e88cf
Adding progress detail to popover
Mau-MD Jul 12, 2022
51e8326
Adding props to popover
Mau-MD Jul 12, 2022
9af7138
Adding portal component
Mau-MD Jul 12, 2022
0df2e40
Adding tooltip logic
Mau-MD Jul 12, 2022
85750c6
Reanming interface
Mau-MD Jul 12, 2022
5c06983
Adding test tooltip
Mau-MD Jul 12, 2022
216be40
Adding position logic to tooltip
Mau-MD Jul 12, 2022
3440288
Restyling popover
Mau-MD Jul 12, 2022
dc91b5e
Adding test popover to one of the courses
Mau-MD Jul 12, 2022
c3fa42f
Fixing typescript errors
Mau-MD Jul 12, 2022
6f718f1
Adding tooltip to the image
Mau-MD Jul 12, 2022
74eab9e
Adding tooltip to the image
Mau-MD Jul 12, 2022
39fe189
Adding props to course card
Mau-MD Jul 12, 2022
bf2b0e5
Adding link between pages
Mau-MD Jul 12, 2022
463ed06
Fixing style issue
Mau-MD Jul 12, 2022
52330e3
Adding new course route
Mau-MD Jul 12, 2022
e917a3f
Adding form componet
Mau-MD Jul 12, 2022
4f25b73
adding course route in backend
Mau-MD Jul 12, 2022
60c534f
Adding more fields to backend user type
Mau-MD Jul 13, 2022
a267b6e
Adding type to user registration
Mau-MD Jul 13, 2022
5cfa994
creating functions to get resources based in a course name
Mau-MD Jul 13, 2022
ea5de15
adding new course route
Mau-MD Jul 13, 2022
6dcca6a
Adding resource type
Mau-MD Jul 13, 2022
18b1cbd
createResource and saveResource function
Mau-MD Jul 13, 2022
f190240
saving resources for different difficulties
Mau-MD Jul 13, 2022
565a27d
Removing intermediate courses
Mau-MD Jul 13, 2022
ebaf615
Merge branch 'main' into new_course
Mau-MD Jul 13, 2022
18afe2a
Adding formik to new course form
Mau-MD Jul 13, 2022
fa7f2c6
Adding form error validation and helper
Mau-MD Jul 13, 2022
e998ced
Fixing backend errors
Mau-MD Jul 13, 2022
0306d60
Adding create course mutation
Mau-MD Jul 13, 2022
fa03a82
Adding types from backend
Mau-MD Jul 13, 2022
b3a9282
Adding toasts
Mau-MD Jul 13, 2022
1d46912
Adding getConfig function to generate the auth headers
Mau-MD Jul 14, 2022
d0a4adf
Adding auth headers to create course post
Mau-MD Jul 14, 2022
1a9cc6d
Adding User Typescript type
Mau-MD Jul 14, 2022
d9ff822
Adding user middleware
Mau-MD Jul 14, 2022
6c743f8
Adding middleware to course route
Mau-MD Jul 14, 2022
e07bb55
Adding get courses function
Mau-MD Jul 14, 2022
e3bcf2f
Adding get my courses route
Mau-MD Jul 14, 2022
938e137
Showing cards in react
Mau-MD Jul 14, 2022
9e9ddf2
Adding objectId as link between pages
Mau-MD Jul 14, 2022
d7e26d0
Adding link between category and
Mau-MD Jul 14, 2022
c708c75
Adding resources route
Mau-MD Jul 14, 2022
e787f69
Creater resources.ts and moved some functions there
Mau-MD Jul 14, 2022
5d6fd4e
adding get resources by courseId
Mau-MD Jul 14, 2022
538ddfc
adding objectId to resource type
Mau-MD Jul 15, 2022
ce26e67
Adding fetching courses from database
Mau-MD Jul 15, 2022
b60de40
adding difficulty propr
Mau-MD Jul 15, 2022
6229ab4
Adding function to get resources from course and difficulty
Mau-MD Jul 15, 2022
be9fc62
adding route to get resources from courses and difficulty
Mau-MD Jul 15, 2022
7317ee0
Adding loading card in dashboard
Mau-MD Jul 15, 2022
9bbb8e6
Adding loading card to hub
Mau-MD Jul 15, 2022
ac64104
adding course title to hub
Mau-MD Jul 15, 2022
4c4b26c
adding types for unsplash image links
Mau-MD Jul 15, 2022
88e145c
installing axios in backend
Mau-MD Jul 15, 2022
c989b56
adding calculate course completition function
Mau-MD Jul 15, 2022
b1bdc13
adding image fetching in layout component
Mau-MD Jul 15, 2022
52393b3
adding get course by user and id function and route
Mau-MD Jul 15, 2022
2dd99e9
adding get images by query function
Mau-MD Jul 15, 2022
2a33705
adding course fetching in
Mau-MD Jul 15, 2022
a1a3e3a
changing route params so the layout is consistent
Mau-MD Jul 15, 2022
e17fc6a
Making the image redirect to the actual link
Mau-MD Jul 15, 2022
126dd16
Displaying images fetch from backend
Mau-MD Jul 15, 2022
d257717
Showing course completition
Mau-MD Jul 15, 2022
ace4330
Making images taking a fixed about of space
Mau-MD Jul 15, 2022
6546df7
Adding margin to the bottom ofg the page
Mau-MD Jul 15, 2022
72c5f86
getting the highest quality thumbnail when generating course
Mau-MD Jul 15, 2022
6dc521d
Making the dashboard navbar link actually work
Mau-MD Jul 15, 2022
04c06ab
Removing intermediate from course popover
Mau-MD Jul 15, 2022
af3601a
Making thumbnail style look better
Mau-MD Jul 15, 2022
0797205
Adding tooltip to video component to show full video title
Mau-MD Jul 15, 2022
0d98e5f
Merge branch 'main' into style_fix
Mau-MD Jul 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion backend/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import dotenv from "dotenv";
import Parse from "parse/node";

import auth from "./src/routes/auth";
import cors from "cors";
import { NotFoundError } from "./src/utils/errors";
import debug from "./src/routes/debug";
import cors from "cors";
import course from "./src/routes/course";
import resources from "./src/routes/resources";

dotenv.config();

Expand All @@ -19,6 +21,8 @@ app.use(cors());

app.use("/auth", auth);
app.use("/debug", debug);
app.use("/course", course);
app.use("/resources", resources);

app.get("/", async (req, res) => {
const testObject = new Parse.Object("test");
Expand Down
1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"axios": "^0.27.2",
"cors": "^2.8.5",
"date-fns": "^2.28.0",
"dotenv": "^16.0.1",
Expand Down
Loading