Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
7a2f7f0
Fixed eslint bug
giarreh Feb 26, 2025
0c05b05
username in creat post
Feb 26, 2025
92aef40
profile icon
Feb 26, 2025
40b2364
eslint
Feb 26, 2025
3bf176f
navigation bar, and changed routing
StevenTPh Feb 26, 2025
c8acf5a
Merge pull request #9 from boolean-uk/teacher-cohort-view
Ateeb020301 Feb 26, 2025
123555e
edit and create post
Feb 26, 2025
9f75d6b
Created step 3 and step 4 in Create-Profile
giarreh Feb 26, 2025
91014f3
Changed text for edit post
Feb 26, 2025
02d5bc2
Merge pull request #10 from boolean-uk/create-profile
Ateeb020301 Feb 26, 2025
f1d6f2c
Merge branch 'main' into student-create-new-post
Feb 26, 2025
fc5264c
lint
Feb 26, 2025
58ce2ff
Added requirements for password and email
giarreh Feb 26, 2025
01b0f42
Merge pull request #12 from boolean-uk/student-create-new-post
Ateeb020301 Feb 26, 2025
3498234
fixed login navigaiton
StevenTPh Feb 26, 2025
5b8db9d
removed console log
StevenTPh Feb 26, 2025
e403b13
Merge pull request #11 from boolean-uk/create-profile
Ateeb020301 Feb 26, 2025
e372748
Merge pull request #13 from boolean-uk/teacher-view-profile
giarreh Feb 26, 2025
f5356d1
check if user owns post
Feb 26, 2025
32ddcf8
fixed initialz to correct user
Feb 26, 2025
1c0b7b9
Merge branch 'main' into only-edit-owned
Feb 26, 2025
779c8c1
Merge pull request #14 from boolean-uk/only-edit-owned
Ateeb020301 Feb 26, 2025
d166301
fixed header
Feb 26, 2025
d860caa
Merge pull request #15 from boolean-uk/initials-header
Ateeb020301 Feb 27, 2025
40f29ed
Fixed header so it no longer infintely loads during signup
giarreh Feb 27, 2025
27b1e8a
reverted register code
giarreh Feb 27, 2025
a8b1017
Merge pull request #19 from boolean-uk/header-fix
Ateeb020301 Feb 27, 2025
56fc61d
Dashboard and access level
StevenTPh Feb 27, 2025
41cabf0
Merge branch 'main' into teacher-dashboard
StevenTPh Feb 27, 2025
9601f4d
Merge pull request #20 from boolean-uk/teacher-dashboard
Ateeb020301 Feb 27, 2025
9774585
Wrong place
StevenTPh Feb 27, 2025
6e452f1
Merge pull request #21 from boolean-uk/teacher-dashboard
Ateeb020301 Feb 27, 2025
a761e6d
Dashboard for student and teacher
StevenTPh Feb 27, 2025
7e41f75
Merge pull request #22 from boolean-uk/teacher-dashboard
Ateeb020301 Feb 27, 2025
f18dc84
Post in dashboard
StevenTPh Feb 27, 2025
b9ea6b6
student profile visually done
toege Feb 27, 2025
b76ff64
styling added to project
toege Feb 27, 2025
1e493c0
Teacher profile done visually
toege Feb 27, 2025
d89b932
deleted some files
toege Feb 27, 2025
2f6300e
updated format get
StevenTPh Feb 27, 2025
1b86715
Merge pull request #23 from boolean-uk/teacher-dashboard
giarreh Feb 27, 2025
d8ffb8a
teacher and student complete, just need to enter the urls for the upd…
toege Feb 27, 2025
368751d
updating post on creating post
StevenTPh Feb 28, 2025
dfa6d66
Merge pull request #25 from boolean-uk/teacher-dashboard
kristbsy Feb 28, 2025
8d3fc3e
Merge branch 'main' of github.com:boolean-uk/team-dev-client-2025-t3 …
StevenTPh Feb 28, 2025
426a2f1
Updated to match the API
StevenTPh Feb 28, 2025
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: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
},
"plugins": ["react", "prettier"],
"rules": {
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
],
"react/react-in-jsx-scope": "off",
"react/prop-types": 0
},
Expand Down
12 changes: 6 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: 'npm' # See documentation for possible values
directory: '/' # Location of package manifests
schedule:
interval: "weekly"
interval: 'weekly'

- package-ecosystem: "github-actions"
- package-ecosystem: 'github-actions'
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
directory: '/'
schedule:
interval: "weekly"
interval: 'weekly'
3 changes: 1 addition & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
"printWidth": 100,
"singleQuote": true,
"trailingComma": "none",
"jsxBracketSameLine": false,
"endOfLine": "lf"
"jsxBracketSameLine": false
}
25 changes: 17 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"jwt-decode": "^3.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^5.5.0",
"react-modal": "^3.16.1",
"react-router-dom": "^6.8.0",
"react-scripts": "5.0.1",
Expand Down Expand Up @@ -47,9 +48,9 @@
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-react": "^7.37.1",
"prettier": "^3.3.3"
"prettier": "^3.5.2"
}
}
7 changes: 2 additions & 5 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
Expand Down
2 changes: 1 addition & 1 deletion src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
grid-template-columns: 151px 2fr 1fr;
grid-template-rows: 96px auto;
background-color: #f0f5fa;
height: 100vh;
min-height: 100vh;
}

.ReactModal__Body--open,
Expand Down
84 changes: 59 additions & 25 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,77 @@
import './App.css';
import React from 'react';
import { Routes, Route } from 'react-router-dom';
import Dashboard from './pages/dashboard';
import CohortTeacher from './pages/cohortTeacher';
import Login from './pages/login';
import Register from './pages/register';
import Loading from './pages/loading';
import Notes from './pages/notes';
import Welcome from './pages/welcome';
import Verification from './pages/verification';
import { AuthProvider, ProtectedRoute } from './context/auth';
import { ModalProvider } from './context/modal';
import Welcome from './pages/welcome';
import { UserProvider } from './context/user';
import StudentProfile from './pages/profile/studentProfile';

const App = () => {
return (
<>
<AuthProvider>
<ModalProvider>
<Routes>
<Route path="login" element={<Login />} />
<Route path="register" element={<Register />} />
<Route path="loading" element={<Loading />} />
<Route path="verification" element={<Verification />} />
<UserProvider>
<ModalProvider>
<Routes>
<Route path="login" element={<Login />} />
<Route path="register" element={<Register />} />
<Route path="loading" element={<Loading />} />
<Route path="verification" element={<Verification />} />

<Route
index
element={
<ProtectedRoute>
<Dashboard />
</ProtectedRoute>
}
/>
<Route
path="welcome"
element={
<ProtectedRoute disabledNav={true}>
<Welcome />
</ProtectedRoute>
}
/>
</Routes>
</ModalProvider>
<Route
index
element={
<ProtectedRoute>
<Dashboard />
</ProtectedRoute>
}
/>
<Route
index
path="cohort"
element={
<ProtectedRoute>
<CohortTeacher />
</ProtectedRoute>
}
/>
<Route
index
path="profile"
element={
<ProtectedRoute>
<StudentProfile />
</ProtectedRoute>
}
/>
<Route
index
path="notes"
element={
<ProtectedRoute requiredRole="TEACHER">
<Notes />
</ProtectedRoute>
}
/>
<Route
path="welcome"
element={
<ProtectedRoute disabledNav={true}>
<Welcome />
</ProtectedRoute>
}
/>
</Routes>
</ModalProvider>
</UserProvider>
</AuthProvider>
</>
);
Expand Down
18 changes: 18 additions & 0 deletions src/assets/icons/clipboardIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* eslint-disable prettier/prettier */
import React from 'react';

const ClipboardIcon = () => {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 33 36"
width="50"
height="56"
fill="currentColor"
>
<path d="M16 2H8C7.45 2 7 2.45 7 3V4H5C4.45 4 4 4.45 4 5V21C4 21.55 4.45 22 5 22H19C19.55 22 20 21.55 20 21V5C20 4.45 19.55 4 19 4H17V3C17 2.45 16.55 2 16 2zM9 4H15V3H9V4zM6 6H18V20H6V6z" />
</svg>
);
};

export default ClipboardIcon;
15 changes: 15 additions & 0 deletions src/assets/icons/commentIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';

const CommentIcon = ({ fill = 'none', stroke = '#000', strokeWidth = 2 }) => {
return (
<svg width="24" height="24" viewBox="0 0 24 24" fill={fill} xmlns="http://www.w3.org/2000/svg">
<path
d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v10z"
stroke={stroke}
strokeWidth={strokeWidth}
/>
</svg>
);
};

export default CommentIcon;
13 changes: 13 additions & 0 deletions src/assets/icons/fileIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* eslint-disable prettier/prettier */
const FileIcon = () => {
return (
<svg width="33" height="36" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M14 2H6C4.9 2 4 2.9 4 4V20C4 21.1 4.9 22 6 22H18C19.1 22 20 21.1 20 20V8L14 2ZM13 9V3.5L18.5 9H13Z"
fill="#000046"
/>
</svg>
);
};

export default FileIcon;
15 changes: 15 additions & 0 deletions src/assets/icons/heartIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';

const HeartIcon = ({ fill = 'none', stroke = '#000', strokeWidth = 2 }) => {
return (
<svg width="24" height="24" viewBox="0 0 24 24" fill={fill} xmlns="http://www.w3.org/2000/svg">
<path
d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
stroke={stroke}
strokeWidth={strokeWidth}
/>
</svg>
);
};

export default HeartIcon;
18 changes: 18 additions & 0 deletions src/assets/icons/noteIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* eslint-disable prettier/prettier */
import React from 'react';

const NoteIcon = () => {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 20"
width="45"
height="50"
fill="currentColor"
>
<path d="M3 3h18v18H3V3zm2 2v14h14V5H5zm2 3h10v2H7V8zm0 4h10v2H7v-2zm0 4h6v2H7v-2z" />
</svg>
);
};

export default NoteIcon;
Loading