Skip to content

Commit

Permalink
chore: merge main branch to admin/v2 (#433)
Browse files Browse the repository at this point in the history
* gql: add query to get count of total articles

* gql: add query to list all articles

* feat: add admin panel navigator

* feat: add admin panel header

* feat: add admin panel marginal

* feat: add category card

* feat: show logged in user profile pic

* chore: import hooks

* chore: destructure data

* feat: add authors card

* chore: change id type from string to int

* wip: add add categories function

* feat: add browse page

* feat: add mutation to create article

* feat: add query to list all user

* feat: add snack bar aleart

* chore: remove console log

* feat: add new article page

* chore: remove content component

* chore: add link to monday morning wesite in footer

* feat: show default users

* feat(graphql): add update article props

* feat(graphql): get restricted artcile data

* feat(graphql): add mutation to update article categories

* feat(graphql): add mutation to update article users

* feat: select default category

* chore: remove unuse import

* feat: add index page

* chore: remove console log

* feat: activate edit button

* feat: add media previewer

* wip: init image kit

* feat: add drop down

* feat(graphql): add mutation to update article cover

* feat(graphql): add mutation to add media

* wip: get cover media data

* feat: add loading indicator

* feat: add edit component

* feat: add media page and screen

* chore: sample content page

* wip: redirect to admin page after login

* feat: check permission

* feat: add error handling

* feat: update article publish status

* graphql: update article restriction

* feat(graphql): add update article approval status

* fix: get approval status

* feat: update article restriction and approval status

* feat: tags component

* feat: get podcast data (#356)

* chore: fix pritter issue (#359)

* fix: prettier format check (#360)

* chore: fix prettier issue

* fix: prettier format check

* fix: photostory import issue  (#362)

* wip:PhotoStory to _Photostory

* wip: _Photostory to Photostory

* fix: update yarn.lock

* feat: enable dynamic spotify embed (#364)

* feat: enable spotify

* feat: show dynamic embded

* feat: basic integration of live page (#384)

* fix: add course list and disable till implementation

* fix: integrate data display

* chore: add session list

* feat: integrate live page

* feat(events): add calendar component for events page (#338)

* feat(events): add calendar component for events page

* style: add gaps between weekdays and the days box.

* feat: add a events page

* chore: rename about to event.

* fix: flicker

* fix: gap between day box and bottom

* fix: remove events page

* chore: add chart js

Co-authored-by: Kanhaiya <[email protected]>

* fix(photostory): add dynamic og meta tags (#378)

* fix(photostory): add dynamic og meta tags

* fix: modify og tag content url

* fix: modify og tag in article page

* fix: live and department links (#387)

* fix: live and departments links

* chore: prettier check

* fix: autocomplete search-bar flickering (#373)

* fix: search-bar animation

* fix: debounce time

* fix: article overflow due to link (#375)

* fix: link overflow

* fix: deprecated break-word

* fix: add null check for article (#370)

* fix: add null check for article

* fix: remove while loop

* fix: remove console.log

* fix: optional rendering of articles

* fix: consider all cases

* feat: add onboarding pagination (#388)

* feat: add onboarding pagination

* feat: smoothen mobile onboarding

* fix: button styling

* chore: remove redundant lines

* fix: set placed data in mobile screen (#386)

* style: fix styling issue in mobile screen

* fix: set placed data in mobile screen

* fix(article): fix table data and max width of article (#368)

* fix(table): fix missing data and max width

* style: add max width to the width

* feat(guide): add mini print carousel (#374)

* feat(guide): add mini print carousel

* fix: add link in mobile view

* fix: back button routing in healthInfo Page

* chore: redirect live page (#391)

* Merge branch 'main' into guide-miniPrint

* chore: reduce no. of state

* fix: remove coming soon

Co-authored-by: Ashish Padhy <[email protected]>

* fix: handle null contributions (#396)

* fix: handle null contributions

* fix(portfolio): null contributions

* chore: change contribution message

* fix: alignment of table of content (#385)

* fix: alignment of table of content

* fix: alignment on mobile/tablet screens

* feat: temporarily remove cwc section (#408)

* fix: add sac posts (#409)

* chore: remove url hardcoding (#410)

* fix: og tags of portfolio (#400)

* fix: og tags of portfolio

* fix: og tags

* feat: add hall page (#401)

* Hall Images

* feat: Hall Info  Page

* fix: Hall Page Routing

* fix: Mobile view

* fix: Cleaning code

* Fix: Formating

* Fix: Placeholder change

* fix(guide): add icon3 in option.js (#420)

* fix: auth key errors (#411)

* chore: upgrade packages to latest minor-patch (#423)

* chore(deps): bump loader-utils from 2.0.2 to 2.0.4 in /client (#312)

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](webpack/loader-utils@v2.0.2...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 in /client (#341)

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump json5 from 1.0.1 to 1.0.2 in /client (#392)

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Rutaj Dash <[email protected]>
Co-authored-by: Kanhaiya Agrawal <[email protected]>
Co-authored-by: Kanhaiya <[email protected]>
Co-authored-by: Anish Sarawgi <[email protected]>
Co-authored-by: Ashish Padhy <[email protected]>
Co-authored-by: Silpa Priyadarshini <[email protected]>
Co-authored-by: G.Anish Kumar Patro <[email protected]>
Co-authored-by: Amal Mohan <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
10 people authored Mar 3, 2023
1 parent 8366e26 commit 6ed1c59
Show file tree
Hide file tree
Showing 67 changed files with 3,085 additions and 1,209 deletions.
Binary file added client/src/assets/images/guide/mini-print1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/guide/nitR-101(2).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/guide/nitR-101.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/cvr.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/dba.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/gdb.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/hb.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/kms.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/mss.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/mv.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/sd.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/images/halls/vs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 24 additions & 3 deletions client/src/assets/placeholder/guide.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
/* eslint-disable */
import img from '../../assets/images/carousel.png';
import imgPrint from '../images/guide/mini-print1.png';
import nitR_1 from '../images/guide/nitR-101.png';
import nitR_2 from '../images/guide/nitR-101(2).png';

export const OPTIONS = Object.freeze({
tags: [
'NITR-101',
// 'NITR-101',
'Commn. Directory',
'Print Issue',
'SAC & Clubs Info',
'Hall Info',
'Health Info',
'Archives',
// 'Hall Info',
// 'Archives',
],
});

Expand Down Expand Up @@ -38,3 +41,21 @@ export const ARCHIVES = Object.freeze({
});

export const CAROUSEL = Object.freeze([img, img, img, img, img]);

export const MINI_PRINT = Object.freeze([
{
img: imgPrint,
link: 'https://drive.google.com/file/d/1wK9g_auqkSnFZdQpKdyHCQA8ECF33FFA/view?usp=sharing',
desc: '',
},
{
img: nitR_1,
link: 'https://drive.google.com/file/d/1vs_Uel9_ARSc9w1DPnowKau5Z9OAy4Kc/view?usp=sharing',
desc: '',
},
{
img: nitR_2,
link: 'https://mondaymorning.nitrkl.ac.in/article/62c492847b0cb908870f747a/NITR-101-Making-Your-Choice-Of-NIT-Rourkela-Simpler',
desc: '',
},
]);
Loading

0 comments on commit 6ed1c59

Please sign in to comment.