Skip to content

Fix: Matched Textbox and Text Color on URL Shortener Page #1578

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

Merged
evanugarte merged 5 commits into from
May 31, 2025
Merged

Fix: Matched Textbox and Text Color on URL Shortener Page #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8792ed3
commited
alanvu2440 Feb 3, 2025
b43a8c7
Removed URLShortenerPage.js and urlShortener.js from tracking
alanvu2440 Feb 3, 2025
cc7fb1f
removed comments from previous push
alanvu2440 Feb 3, 2025
c3c4a99
update so light mode font is visible
alanvu2440 Feb 4, 2025
194fb7d
dont cache?
evanugarte May 31, 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
8 changes: 4 additions & 4 deletions .github/workflows/node.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 16
cache: 'npm'
# cache: false
- run: python setup.py
- name: cache frontend dependencies
id: frontend-cache
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 18
cache: 'npm'
# cache: false
- run: python setup.py
- name: Starting MongoDB
uses: supercharge/mongodb-github-action@1.3.0
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 16
cache: 'npm'
# cache: false
- run: python setup.py
# the frontend dependencies include eslint
- name: cache frontend dependencies
Expand All @@ -104,7 +104,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 16
cache: 'npm'
# cache: false
- run: python setup.py
# the frontend dependencies include eslint
- name: cache frontend dependencies
Expand Down
20 changes: 10 additions & 10 deletions src/Pages/URLShortener/URLShortener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function URLShortenerPage(props) {
const [currentSortColumn, setCurrentSortColumn] = useState(null);
const [currentSortOrder, setCurrentSortOrder] = useState(null);

const INPUT_CLASS = 'indent-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6 text-white';
const INPUT_CLASS = 'indent-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6 text-gray';
const LABEL_CLASS = 'block text-sm font-medium leading-6 text-gray-300';

/**
Expand Down Expand Up @@ -199,7 +199,7 @@ export default function URLShortenerPage(props) {
<p className='md:hidden'>
{startingElementNumber} - {endingElementNumber} / {total}
</p>
<p className="hidden md:inline-block">
<p className="hidden md:inline-block text-base leading-7 text-gray-300">
Showing <span className='font-medium'>{startingElementNumber}</span> to <span className='font-medium'>{endingElementNumber}</span> of <span className='font-medium'>{total + 1}</span> results
</p>
</>)}
Expand Down Expand Up @@ -230,7 +230,7 @@ export default function URLShortenerPage(props) {
if (!showUrlInput) {
return (
<button
className="btn btn-outline"
className="btn btn-outline text-base leading-7 text-gray-300"
onClick={() => setShowUrlInput(true)}
>
+ Create a new link
Expand Down Expand Up @@ -258,15 +258,15 @@ export default function URLShortenerPage(props) {
placeholder="https://example.com"
value={url}
onChange={e => setUrl(e.target.value)}
className={INPUT_CLASS}
className="w-full text-sm input input-bordered sm:text-base"
/>
</div>
</div>

<div className="col-span-3">
<div className="form-control">
<label className="label cursor-pointer">
<span className="label-text">Use Generated Alias</span>
<label className={`label cursor-pointer ${LABEL_CLASS}`}>
<span className={LABEL_CLASS}>Use Generated Alias</span>
<input type="checkbox" className="toggle" checked={useGeneratedAlias} onChange={(e) => setUseGeneratedAlias(e.target.checked)} />
</label>
</div>
Expand All @@ -283,7 +283,7 @@ export default function URLShortenerPage(props) {
name="alias"
value={alias}
onChange={e => setAlias(e.target.value)}
className={INPUT_CLASS}
className="w-full text-sm input input-bordered sm:text-base"
/>
</div>
</div>
Expand Down Expand Up @@ -312,8 +312,8 @@ export default function URLShortenerPage(props) {

function maybeRenderSearch() {
return (
<><div className="label">
<span className="label-text text-md">Type a search, followed by the enter key</span>
<><div className={'label ${LABEL_CLASS}'}>
<span className={LABEL_CLASS}>Type a search, followed by the enter key</span>
</div><input
className="w-full text-sm input input-bordered sm:text-base"
type="text"
Expand Down Expand Up @@ -419,7 +419,7 @@ export default function URLShortenerPage(props) {
{maybeRenderSearch()}
</div>
<div className='overflow-x-auto transition'>
<table className='table px-3'>
<table className='table px-3 block text-sm leading-6 text-gray-300'>
<thead>
<tr>
{[
Expand Down