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.

Sign up for GitHub

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

L3 #12

Merged
merged 12 commits into from
Aug 9, 2023
Merged

L3 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8e2186e
feat: enable dept heads to add pubs
bit-by-bits Jul 6, 2023
e2307e5
feat: add faculty page, update deps
bit-by-bits Jul 7, 2023
429b20f
fix: pending changes
bit-by-bits Jul 8, 2023
0a11e6c
fix: change field names
bit-by-bits Jul 10, 2023
1da0b11
fix: set extras
bit-by-bits Jul 10, 2023
916d0a0
feat: add softcopy btns, add research for lvl2
bit-by-bits Jul 13, 2023
243f294
feat: enable adding faculty
bit-by-bits Jul 14, 2023
6ba06a2
feat: allow to switch accounts
bit-by-bits Jul 22, 2023
04915af
fix: update src deps
bit-by-bits Jul 22, 2023
5676360
fix: render button on prev token
bit-by-bits Jul 24, 2023
792f6b3
fix: doc changes
bit-by-bits Jul 30, 2023
66698c5
feat: added level 3
bit-by-bits Aug 9, 2023
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
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"start": "next start"
},
"dependencies": {
"@ant-design/icons": "^5.0.1",
"antd": "^5.4.2",
"axios": "^1.3.5",
"@ant-design/icons": "^5.1.4",
"antd": "^5.6.4",
"axios": "^1.4.0",
"chart.js": "^4.3.0",
"chartjs-plugin-datalabels": "^2.2.0",
"next": "^13.3.0",
"next": "^13.4.9",
"react": "^18.2.0",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.2.0",
Expand Down
10 changes: 6 additions & 4 deletions pages/add/award.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ import Image from "next/image";
import axios from "axios";
import URLObj from "../../src/components/baseURL";
import { useUser } from "../../src/components/context/userContext";
import { useAccess } from "../../src/components/context/accessContext";

const Awards = () => {
// HOOKS

const router = useRouter();
const [form] = Form.useForm();

const { access } = useAccess();
const { user } = useUser();

const { Dragger } = Upload;
const [form] = Form.useForm();

// STATES

Expand Down Expand Up @@ -208,9 +212,7 @@ const Awards = () => {
<Form
form={form}
name="award"
style={{ width: "80vw", transform: "translateX(-10vw)" }}
labelCol={{ span: 8 }}
wrapperCol={{ span: 16 }}
style={{ width: "80vw", padding: "0 10vw" }}
initialValues={
data?.start_date
? {
Expand Down
9 changes: 5 additions & 4 deletions pages/add/book.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ import Image from "next/image";
import axios from "axios";
import URLObj from "../../src/components/baseURL";
import { useUser } from "../../src/components/context/userContext";
import { useAccess } from "../../src/components/context/accessContext";

const Books = () => {
// HOOKS

const router = useRouter();
const { user } = useUser();
const [form] = Form.useForm();

const { access } = useAccess();
const { user } = useUser();

// STATES

const [visible, setVisible] = useState(true);
Expand Down Expand Up @@ -191,9 +194,7 @@ const Books = () => {
<Form
name="book"
form={form}
style={{ width: "80vw", transform: "translateX(-10vw)" }}
labelCol={{ span: 8 }}
wrapperCol={{ span: 16 }}
style={{ width: "80vw", padding: "0 10vw" }}
initialValues={{
faculty: user?.name,
department: user?.department,
Expand Down
10 changes: 6 additions & 4 deletions pages/add/conference.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ import { useEffect, useState } from "react";
import { Button, DatePicker, FloatButton, Form } from "antd";
import { Select, Spin, Upload, message, Input } from "antd";
import { useUser } from "../../src/components/context/userContext";
import { useAccess } from "../../src/components/context/accessContext";

const Conferences = () => {
// HOOKS

const router = useRouter();
const { user } = useUser();
const [form] = Form.useForm();

const { access } = useAccess();
const { user } = useUser();

const { RangePicker } = DatePicker;
const { Dragger } = Upload;

Expand Down Expand Up @@ -226,9 +230,7 @@ const Conferences = () => {
<Form
form={form}
name="conference"
style={{ width: "80vw", transform: "translateX(-10vw)" }}
labelCol={{ span: 8 }}
wrapperCol={{ span: 16 }}
style={{ width: "80vw", padding: "0 10vw" }}
initialValues={
data?.start_date && data?.end_date
? {
Expand Down
9 changes: 5 additions & 4 deletions pages/add/ipr.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ import Top from "../../src/components/Common/Top";
import axios from "axios";
import URLObj from "../../src/components/baseURL";
import { useUser } from "../../src/components/context/userContext";
import { useAccess } from "../../src/components/context/accessContext";

const IPR = () => {
// HOOKS

const router = useRouter();
const { user } = useUser();
const [form] = Form.useForm();

const { access } = useAccess();
const { user } = useUser();

// STATES

const [visible, setVisible] = useState(true);
Expand Down Expand Up @@ -101,9 +104,7 @@ const IPR = () => {
<Form
name="ipr"
form={form}
style={{ width: "80vw", transform: "translateX(-10vw)" }}
labelCol={{ span: 8 }}
wrapperCol={{ span: 16 }}
style={{ width: "80vw", padding: "0 10vw" }}
initialValues={{
faculty: user?.name,
department: user?.department,
Expand Down
Loading