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

Implementing dashboard + tooltip complex component #9

Open
wants to merge 73 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e6f9564
Unifying courses header into one single layout
Mau-MD Jul 5, 2022
90462e0
Adding register route
Mau-MD Jul 5, 2022
6ce44f6
Adding registration form
Mau-MD Jul 5, 2022
6f67536
Adding email field and responsiveness to Register Component
Mau-MD Jul 5, 2022
242a039
Adding login route
Mau-MD Jul 5, 2022
50afeaa
Adding login component
Mau-MD Jul 5, 2022
2548f13
Adding link between pages
Mau-MD Jul 5, 2022
0612426
Chaning ensureWeightsAreCorrect so the recive a parameter
Mau-MD Jul 11, 2022
a44b6e7
exporting functions so they can be used in text
Mau-MD Jul 11, 2022
9b63bde
adding weight test
Mau-MD Jul 11, 2022
9b94adb
refactoring code folders
Mau-MD Jul 11, 2022
1a31aaf
Configuring jest for typescript
Mau-MD Jul 11, 2022
9929874
adding return statement
Mau-MD Jul 11, 2022
0cfa32e
adding daysSincePublished test
Mau-MD Jul 11, 2022
df958a0
adding descriptionWithChapters test
Mau-MD Jul 11, 2022
b407f3c
adding daysXLikes test
Mau-MD Jul 11, 2022
330d1e9
adding getXLikes test
Mau-MD Jul 11, 2022
6b655a9
adding date test
Mau-MD Jul 11, 2022
a920787
adding ranking test
Mau-MD Jul 11, 2022
8c49e01
Merge branch 'main' into ranking_unit
Mau-MD Jul 11, 2022
76e0fed
adding jest unit test to gh action
Mau-MD Jul 11, 2022
f6e0fe5
Merge branch 'main' into register
Mau-MD Jul 11, 2022
8614427
Installing formik
Mau-MD Jul 11, 2022
532d8f8
installing yup
Mau-MD Jul 11, 2022
8926dd5
Adding formik and yup validationi
Mau-MD Jul 11, 2022
64732f1
Adding form error messages
Mau-MD Jul 11, 2022
0737e8f
adding axio
Mau-MD Jul 11, 2022
4378856
adding base url constant
Mau-MD Jul 11, 2022
ddc1c09
adding query provider
Mau-MD Jul 11, 2022
b15fe28
adding handleRegistration mutation
Mau-MD Jul 11, 2022
7d25e6e
Adding cors
Mau-MD Jul 11, 2022
a62e6e2
Adding toast on succes and failure
Mau-MD Jul 11, 2022
aa9c245
Adding typescript to error handler
Mau-MD Jul 11, 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
4b5ccd2
Merge branch 'main' into dashboard
Mau-MD Jul 13, 2022
635a811
removing flacky test
Mau-MD Jul 13, 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
7 changes: 6 additions & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: testing
on: [pull_request]
jobs:
e2e-testing:
testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -13,3 +13,8 @@ jobs:
run: |
npm install
npm run e2e:headless
- name: "Run Jest Unit Tests"
working-directory: ./backend
run: |
npm install
npm run test
8 changes: 5 additions & 3 deletions backend/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import express from "express";
import dotenv from "dotenv";
import Parse from "parse/node";

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

dotenv.config();

Expand All @@ -14,6 +15,7 @@ Parse.serverURL = process.env.PARSE_SERVER_URL;
const app = express();

app.use(express.json());
app.use(cors());

app.use("/auth", auth);
app.use("/debug", debug);
Expand Down
6 changes: 6 additions & 0 deletions backend/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
presets: [
["@babel/preset-env", { targets: { node: "current" } }],
"@babel/preset-typescript",
],
};
6 changes: 6 additions & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "backend",
"version": "1.0.0",
"description": "",
"type": "commonjs",
"main": "index.js",
"scripts": {
"start": "node --loader ts-node/esm ./index.ts",
Expand All @@ -13,6 +14,7 @@
"license": "ISC",
"dependencies": {
"date-fns": "^2.28.0",
"cors": "^2.8.5",
"dotenv": "^16.0.1",
"express": "^4.18.1",
"googleapis": "^105.0.0",
Expand All @@ -21,11 +23,15 @@
"ts-node": "^10.8.1"
},
"devDependencies": {
"@babel/core": "^7.18.6",
"@babel/preset-env": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@types/express": "^4.17.13",
"@types/jest": "^28.1.3",
"@types/node": "^18.0.0",
"@types/nodemailer": "^6.4.4",
"@types/parse": "^2.18.16",
"babel-cli": "^6.26.0",
"jest": "^28.1.2",
"nodemon": "^2.0.18",
"ts-jest": "^28.0.5",
Expand Down
Loading